projects / xen.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 943cb85 ac102a9)
bitkeeper revision 1.1159.258.129 (42886ca7vP3iN1FMZTIHAFtA7vXoiw)
authorcl349@firebug.cl.cam.ac.uk <cl349@firebug.cl.cam.ac.uk>
Mon, 16 May 2005 09:49:27 +0000 (09:49 +0000)
committercl349@firebug.cl.cam.ac.uk <cl349@firebug.cl.cam.ac.uk>
Mon, 16 May 2005 09:49:27 +0000 (09:49 +0000)
Merge firebug.cl.cam.ac.uk:/auto/groups/xeno-xenod/BK/xen-2.0-testing.bk
into firebug.cl.cam.ac.uk:/local/scratch/cl349/xen-2.0-testing.bk-clean

1  2 
.rootkeys patch | diff1 | diff2 | blob | history

diff --cc .rootkeys
Simple merge
Unnamed repository; edit this file 'description' to name the repository.